Bug fixes for app