Fixed some compat issue
Improved default behavior