MP1 plugin - fixes and additional checks