Various minior updates