Fixes for a basic working