Various fixes, changes.