Just some QND fixes to make it working