Remove find bugs warnings