Last couple of fixes for crayftn