Minor mods (less debugging)