Fixed pre/code issues