Fixed issues that I never copied into the branch :(