Small improvements

Done.