#905: further fixes for all parts (Posted: done)

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>