- Fix minor bugs and issues