All fixes as requested per @yungpanda_be