First pass at beta 5 fixes.
Fixed default init for view controller.