Some quality fixes
Fix regression (Model component wave handler must be called into the
JAT)
Thanks to Mastering Tables (integration test)