Removed nullable int types - accidentally snuck in on previous commit