Miniature fixes

This is a partial commit