Minor bug fixes. Removed dconf module as it wasn't working