Bearing fixes