Fixes and more