Small changes, :shipit: