Small fixes, done for today :)