Fixing some rough edges