More bugs related to the code conslolidation recently.