Bug fixes

Please merge me