Fixed a few warnings and some @deprecated

Signed-off-by: Michael Vorburger <mike@vorburge>