Stuff

Random fixes

fixes #1855