attempt ios fix, misc fixes