Fixing major OH panel bugs