Fixing stuff I messed up when I merged from develop.