Improved carrier tracking, clean up two conversion warnings on 64-bit compiles