Bug fixes only

Signed-off-by: aprice2704 <aprice2704@gmail.com>