Several bug fixes, nothing new.