Fix some issues
Fix build views