Premium calculator fixes