Small usability fixes, fix bitwise AND intended as logical AND