Ned/fix problems again

@cpennington, if you would.