Fix some things after suggestions