Minnor improvements