Error Fixes from origin