Again, bug fixes