Fixed minor issues on debug and serve deployment