Fixing minor bugs (title required)