Fixes on lockscreen, and a bit of cleaning.