Fixed staging bugs in development branch