Final fixes, all ready to merge