fixes for derpy code caused by pull from github