+ Error fixes release 0.6