18 Commits (fixTypesAgain)