Few bug fixes...