Bug fixes
No more var args