Fix for #83, #86, #94, #103, #105, #106, #107, #108, and #110#111