Fixed views to match runtime.