Cperello/minor fixes

Pretty please...