Misc. fixed (no more weight casts to int)