Various fixes, not done