Small changes + quick fixes