Fix build errors relating to the lockscreen commits