Updates to allow for a 1.6 compilation (if needed).