Removing warnings due to unsafe checks