Fixes for Maxijp