Fix remaining constant issues