Added author #3 fixes