Just fixin' some bugs