Stuff

Just some generic fixes
fixes #1761
fixes #1758
fixes #1755