Platform cleanup

Missed a few other macros