Multiple bug-fixes