Minnor improvments in general