Fixes to get things working on the actual system