Fix a few more things -- now things work well