Some fixes, lol