More review fixes, SQUASH BEFORE MERGING!