Various minifixes