Minor bug fixes

* Make sure necessary imports are included in each file