Fixes for setup method to be run by parent class