Fixes

Please merge ASAP