Small workding fixes.