Initial fixes for minor methods