Fixed 2 warnings so that lint is a little happier again