Bug fixes
Missing targets and cleanup