Some platform cleanup