minor buxfixes and updated deprecated code

Signed-off-by: Carsten Witzke <carsten@staticline.de>