Bug fixes for Jenkins issues (as well as a couple fixes to stupid stuff).