Fixes and wire ups