LAYERS: More 32-bit fixes caused by recent commits.

Had to fix more 32-bit build issues caused by recent commits.
2 files changed