Continue fixing bugs