Some more fixes

;)