Completed porting on 3.8. All issues and non-working functions removed