Fixed build problems

Should fix recovery problems