Server compiler code and minor fixes