more paperclip fixes