Fixes and some other stuff.