other bug fixes