Work on improving platform independence