Last fixes, it should work now