Some minor fixes to methods