Bug fixes and utils update