Yay recipes.
Fix some NPE issues, also def handling is fixed too.