Minor bug fixes !