More stupid bugs being fixed