fixes for Kepler