Some minor bugs resolved