Fixes for working jalimo SWT example
Some fixes and changes following Avian cleanup.