Fix views & features