Fix a byte-compile issue and warnings.
Added K. Adam Christensen to contributors list.