-w fixes