Adding fixes for APPM-236