Fix source file name comments
Fix NRE on invalid second attribute target