Wakelock changes, default avatar fix