updates to make Swift beta 6 happy