Final fixes for new atop rotation scheme