bugfixes: C343-218, C343-275, C343-276

Signed-off-by: Steven Noonan <steven@uplinklabs.net>