Fix #42, #68, and #69
Fix some checked mode errors