Fix periodic bundle metal controllers
Fix some NPEs in JnlpHelper