Some compile time fixes as I begin testing in Modulex...