Added lazy-loading of taps. Fixed broken permissions.