Fix several KaSa warnings