FW-279. Fixing prototype warning.
FW-279. Housekeeping.