Fix zoom + Fix things