Some changes to remove errors and warnings.
Added a default bean.