FIXES TO NANOBAY