Improvements to last commit, this should make things work better on all platforms