Widget includes fixes