Fixed: minor fixes