Update Serializable methods

Also gets rid of those pesky warnings