Fixed some jankyness