ng fixes, done for now