Fixed issues I created in the last rebase and merge