Several fixes, ready to go