Fixes on views