Simple fixes for type warnings