Some final bug fixing