Cleaned up warnings