#4 CodeService fixes