Adding fixes to app