Fixed stuff broken by the coding style cleanup