move to kepler

fixes for the Kepler version done by pleacu and me