Misc. fixes and changes in CE/monitor-ce