Updates to work with newer gems