Fixes to make stuff work