Mostly fixes