Fixing compile errors for missing types