Ziji's fixes that were in the wrong folder