Fix some of @jancborchardt's complaints in oc_avatars