Tweaked some OpenIMAJ code