Fixing bugs on deployment version