Multiple bug fixing