Small operation and model fixes