More bug creation fixes