Fixed some expression/register stuff