fixes for James