misc: Use new rotate functions