Taking care of some rough edges...