Fixes according to bill's comment