Fixed warnings pointed out by FC