Try to cover all the latest stuff

Thanks to @rehno-lindeque for pointing some of these out!