Some changes for testing console work.