Fixes/misc

Various fixes, no common theme.