General testing and fixing...