Fixes to earlier valentines stuff