Slight improvements