Fixes according to Noah's comments