Production fixes for less comiliation