Some minor updates

Some minor bugs resolved