Bugfix: Elliminate some warnings