Fixing/Cleaning up some oversights