Bug fixes for window machines