Minor stuff
Minor bug fixes