Resolving issues before merge with develop