Fix display init + revert CM3629 updates