Fixes before angular