Fixing minor bugs now