Remove obvious bugs