minnor fixes