Fixed build
Cleaned up warnings