Bug fixes in wInit