Fixes and missing bits