Fix build warnings

Just fixing some build warnings