fixed 508 issues identified by the wave plugin