Code cleanup

Fixed up warnings.