Small changes on some stuff