Several bug-fixes