Generic changes

Signed-off-by: Suki <suki@missallsunday.com>
meh, I borked something, dunno what

Signed-off-by: Suki <suki@missallsunday.com>
I missed this when BreezeUser was transformed to procedural

Signed-off-by: Suki <suki@missallsunday.com>