Continued bug fixing