Partial fix for #47 - Add missing @Override annotations