More work
Fix warnings