Small fixes while testing with the amelia theme.