some OS-safe changes