Bug fixes for UI Router