Fixed build warnings (some)