Fixed other small bugs