Fixes and fixes to small stupidity II