Fixes and misc