Fix solid bugs