Wyphon fixes for bugs I introduced when refactoring...