Fixes deployment bugs