Misc fixes

@dszoboszlay Addressed in new commit.