Fixing a few oversights