* Still trying to clean up compiler warnings