Adding fixes to startresque