MMBF (Minor Mariano Bug Fixes)