Just fixin' bugs