Fixed minore issues