Minnor fixes