A few tweaks to fix code style and a broken test after temp homepage fix.