Fixes for pending views