Minor fixes, remove warnings