Beta4 fixes; Fixes #66; Fixes #67