Fix a couple frame scenarios, remove logging