More home boxes fixes