-Minor bug fixes



More...