Fixed minior js issues