Fixed: minor bugs