Fix a few missing pieces
1.1.0