Fixed up some yapsy issues