Compilation fixes (thanks to Jenkins)