Updates to make things work on PWS