Minor fixes for warning