Bug fixes to make it work