fixes for angular integration problems