Mattcreager/platform updates