Quick hacks to sort out crsh issue.