Minor fixes

Feel free to pick whatever you want from it.. :)