Lots of L compability and fixes