Fixed bundle issues in POM