Fixes deployement issues