Solve more problems with Dict definitions

Keys should be of the correct type