Angular fixes