Fixing some issues after upgrading to processing2