Fix some zoom related bugs