Fixed some dynamic stuff