* Minor bug fixes;