Fixes and missing parts