Fixed compile errors for my computer. Marvin could you test these on yours