0.9.16: Fixed some minor bugs