Some more code consistency things