Fixes for missing parts