Fixing high priority issues