HR-327 and additional fixes