Fixes to make things realy work