Added some SuppressWarnings