WIP Updated NLA changes to work under win32 and linux