Bug fixes for APPM-227