Implements NOISSUE - Small features corrections

Sign-off: @mumia