Bugfix/pooroverrides

Some overrides where broken and we didn't notice until it was too late as they weren't annotated with @Overrides.