Fixes for missing files