Changes, mainly fixes