Fixed some warnings for codexlayout