Some updates

Small future proofing.