Little corrections and preparation for jenkins