fixed some compilation issues across machines