MHAPI update - resolving warnings part one