[WFLY-456] A few small fixes