- Bug fixes

- Helper functions