Bug fixes for the various controllers and services.