Attempting to fix api breaking apps