Fixes to work with our system