Add some basic future-proofing to the code