Bug fixes, too lazy to use atomic commits