Minor fixes, back to working state