Fix several small issues

fixes #2151