Consistency and JS corrections.