Fixed additional issues as requested