Fix drift and minor cosmetics