Even more fixes (I'm getting tired...) thx Sachin Thomas again!