Minor fixes

- Cleaned up bubble