Fixes and DRY!