Trying to fix some bug creation problems