Fixes after the MASSIVE merge conflicts...FUN