Fixed misc minor issues

Ditto