Fixin' bugs