Found a few bugs while compiling fresh.