Some fixes and aspect rebalancing

Changes for the upcoming 4.1.0.f update